merge
authorIan Campbell <ian.campbell@xensource.com>
Fri, 25 Aug 2006 09:06:24 +0000 (10:06 +0100)
committerIan Campbell <ian.campbell@xensource.com>
Fri, 25 Aug 2006 09:06:24 +0000 (10:06 +0100)

Trivial merge